Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 10 Mar 2010 15:00:47 +0000 (15:00 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 10 Mar 2010 15:00:47 +0000 (15:00 +0000)

Trivial merge